Conversation
Contributor
Author
This stack of pull requests is managed by Graphite. Learn more about stacking. |
Contributor
Prompt To Fix All With AIFix the following 1 code review issue. Work through them one at a time, proposing concise fixes.
---
### Issue 1 of 1
apps/code/src/main/services/git/service.ts:632-638
**No test coverage for the new `linkBranch` call in `createPr`**
The test file updates `GitService` constructors to accept a `WorkspaceService` stub (`{} as WorkspaceService`), but no test verifies that `workspaceService.linkBranch` is called (with the right args) during `createPr`. This is the core behaviour change of the PR, and `createPr` currently has zero test coverage. If a proper mock were supplied (e.g. `{ linkBranch: vi.fn() } as unknown as WorkspaceService`), it would also prevent a silent `TypeError` if any future test exercises a code path through `createPr` with a `taskId`.
Reviews (1): Last reviewed commit: "feat(code): harden branch linking during..." | Re-trigger Greptile |
![greptile-apps[bot]](https://avatars.githubusercontent.com/in/867647?s=60&v=4){kind=small}
Comment on lines
+632
to
+638
| if (input.taskId) { | ||
| const linkedBranch = | ||
| input.branchName ?? (await getCurrentBranch(directoryPath)); | ||
| if (linkedBranch) { | ||
| this.workspaceService.linkBranch(input.taskId, linkedBranch, "user"); | ||
| } | ||
| } |
Contributor
There was a problem hiding this comment.
linkBranch call in createPr
The test file updates GitService constructors to accept a WorkspaceService stub ({} as WorkspaceService), but no test verifies that workspaceService.linkBranch is called (with the right args) during createPr. This is the core behaviour change of the PR, and createPr currently has zero test coverage. If a proper mock were supplied (e.g. { linkBranch: vi.fn() } as unknown as WorkspaceService), it would also prevent a silent TypeError if any future test exercises a code path through createPr with a taskId.
Prompt To Fix With AI
This is a comment left during a code review.
Path: apps/code/src/main/services/git/service.ts
Line: 632-638
Comment:
**No test coverage for the new `linkBranch` call in `createPr`**
The test file updates `GitService` constructors to accept a `WorkspaceService` stub (`{} as WorkspaceService`), but no test verifies that `workspaceService.linkBranch` is called (with the right args) during `createPr`. This is the core behaviour change of the PR, and `createPr` currently has zero test coverage. If a proper mock were supplied (e.g. `{ linkBranch: vi.fn() } as unknown as WorkspaceService`), it would also prevent a silent `TypeError` if any future test exercises a code path through `createPr` with a `taskId`.
How can I resolve this? If you propose a fix, please make it concise.
jonathanlab
approved these changes
May 1, 2026
adboio
changed the base branch from
04-30-chore_code_remove_diff_agent_actions_flag
to
graphite-base/1963
adboio
force-pushed
the
04-30-feat_code_harden_branch_linking_during_pr_creation_flow
branch
from
a74ccfc to
6b77dff
Compare
adboio
force-pushed
the
04-30-feat_code_harden_branch_linking_during_pr_creation_flow
branch
from
6b77dff to
1bb8a35
Compare
Contributor
Author
adboio
deleted the
04-30-feat_code_harden_branch_linking_during_pr_creation_flow
branch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
The unified PR badge in the task header sometimes wouldn't render even though a PR existed — the simpler "View PR" + git options menu would show instead. Worse, it would only "fix itself" once the agent next edited a file.
The badge depends on
workspace.linkedBranchbeing set. Linking happened via a fire-and-forgetworkspace.linkBranch.mutate()call in the renderer (useGitInteraction.runCreatePr) right after the create-PR mutation returned. If the renderer reloaded mid-flow (e.g. Vite HMR during dev, or any IPC tear-down), that second mutation never landed on the main process, the link was silently lost (onlylog.warn'd), and the only recovery washandleAgentFileActivityre-linking on the next agent edit.#1947 made the happy path fast (subscription invalidation + optimistic
getPrUrlForBranchcache prime) but didn't address the durability of the link itself — when the fire-and-forget call is dropped, neither leg of #1947 has anything to act on.closes #1959
Changes
Move the
linkBranchcall into the main-processGitService.createPrflow so it's atomic with PR creation and survives renderer reloads.WorkspaceServiceintoGitService(no circular dep —WorkspaceServicedoesn't depend onGitService).workspaceService.linkBranch(taskId, branchName, "user"). Branch resolved asinput.branchName ?? getCurrentBranch(directoryPath).linkBranch.mutate()blocks inuseGitInteraction.runCreatePr. KeptinvalidateGitBranchQueriesand the optimisticgetPrUrlForBranchcache prime — those still provide the latency win from fix(code): invalidate queries on PR creation #1947, just no longer load-bearing for correctness.GitServicetest instantiations to pass aWorkspaceServicestub.How did you test this?
pnpm --filter code typecheckcleanpnpm --filter code test— all 982 tests passPublish to changelog?
no